Skip to content

sync: Main sync develop#302

Merged
vikramdevtron merged 5 commits into
developfrom
main-sync-develop-23jun
Jun 24, 2025
Merged

sync: Main sync develop#302
vikramdevtron merged 5 commits into
developfrom
main-sync-develop-23jun

Conversation

@vikramdevtron

Copy link
Copy Markdown
Contributor

No description provided.

Shivam-nagar23 and others added 4 commits June 16, 2025 13:57
* feat: add server shutdown timeout configuration and improve logging

* feat: add SERVER_SHUTDOWN_TIMEOUT to configuration
* SecretFieldClusterId to CmFieldClusterId

* replace secret informer with field selector to configmap informer with label selector

* CreateConfigMapObject

* ClusterModifyEventSecretTypeKey

* DeleteConfigMap k8s util func

* correct label selector

* add extra validation in add , update and delete func
if labelValue, exists := cmObject.Labels["type"]; !exists || labelValue != informerBean.ClusterModifyEventSecretType {
						return
					}

* cm informer instead of secret informer for cluster

* bump common lib

* bump common lib

* bump common lib

* bump common lib

* fix

* bump common lib

* bump common lib

* r

* ClusterModifyEventCmLabelValue  = "cluster-request-modify"

* ClusterModifyEventCmLabelValue  = "type=cluster-request-modify"

* import label selector from commonb lib

* import label selector from commonb lib

* ClusterModifyEventCmLabelKeyValue and ClusterModifyEventCmLabelValue

* small fix

* small fix

* add logger for ignoring cluster change event in case label not found

* fix

* logger

* refactoring of CreateConfigMapObject

* fix

* bump common lib

* bump common lib

* remove WithCmName and make cmname as func signature

* code review incorporation

* bump common lib

* make

* bump common lib

* Merge pull request #282 from devtron-labs/dependa-fix

misc: Dependabot changes to fix vulnerabilities

* chore: http shutdown timeout configurable (#291) (#293)

* feat: add server shutdown timeout configuration and improve logging

* feat: add SERVER_SHUTDOWN_TIMEOUT to configuration

Co-authored-by: Shivam Nagar <124123645+Shivam-nagar23@users.noreply.github.com>

* restored mod changes for kubelink and kubewatch (#294)

* vendor update on rc 38 (#295)

* chore: port forward tls client server name (#296)

* chore-port-forward-debug

* review comments resolved

---------

Co-authored-by: Prakash Kumar <prakash.kumar@devtron.ai>
Co-authored-by: kartik-579 <84493919+kartik-579@users.noreply.github.com>
Co-authored-by: prakhar katiyar <39842461+prkhrkat@users.noreply.github.com>
Co-authored-by: Shivam Nagar <124123645+Shivam-nagar23@users.noreply.github.com>
@vikramdevtron vikramdevtron merged commit 29ba3f1 into develop Jun 24, 2025
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants